checkout: Add g_prefix_error() around more failures
authorColin Walters <walters@verbum.org>
Tue, 10 Sep 2013 15:53:40 +0000 (11:53 -0400)
committerColin Walters <walters@verbum.org>
Tue, 10 Sep 2013 16:21:04 +0000 (12:21 -0400)
So we can debug what's going wrong more easily.

src/libostree/ostree-repo-checkout.c

index 00ad1353bb0ccbf9ae636eba9ca08138a395cefe..2d6c51413c8a6b58b1dcace1c20844432dcab3e6 100644 (file)
@@ -345,6 +345,7 @@ checkout_file_hardlink (OstreeRepo                          *self,
     }
   else
     {
+      g_prefix_error (error, "Hardlinking %s to %s: ", loose_path, destination_name);
       ot_util_set_error_from_errno (error, errno);
       goto out;
     }
@@ -466,7 +467,10 @@ checkout_one_file_at (OstreeRepo                        *repo,
                                    destination_dfd, destination_name,
                                    FALSE, &did_hardlink,
                                    cancellable, error))
-        goto out;
+        {
+          g_prefix_error (error, "Using new cached uncompressed hardlink of %s to %s: ", checksum, destination_name);
+          goto out;
+        }
     }
 
   /* Fall back to copy if we couldn't hardlink */
@@ -481,8 +485,11 @@ checkout_one_file_at (OstreeRepo                        *repo,
           if (!checkout_file_unioning_from_input_at (mode, source_info, xattrs, input,
                                                      destination_dfd, destination_parent,
                                                      destination_name,
-                                                     cancellable, error))
-            goto out;
+                                                     cancellable, error)) 
+            {
+              g_prefix_error (error, "Union checkout of %s to %s: ", checksum, destination_name);
+              goto out;
+            }
         }
       else
         {
@@ -490,7 +497,10 @@ checkout_one_file_at (OstreeRepo                        *repo,
                                             destination_dfd, destination_parent,
                                             destination_name,
                                             cancellable, error))
-            goto out;
+            {
+              g_prefix_error (error, "Checkout of %s to %s: ", checksum, destination_name);
+              goto out;
+            }
         }
     }